Temp changes
Improve calculation of offset for prev and next link
Merge branch 'APD-411-BOZ' into develop