always calculate from fixed position, if set
Merge remote-tracking branch 'origin/master'