Merge branch 'refactor_aligcalcs' into develop