Last-minute fixes

This reverts !1480 (merged) and fixes a faulty return that could cause the resynching code to break in some situations.

added 1 commit

• 34911128 - Update copyright date

Compare with previous version

merged

mentioned in commit 1355a82a