Merge branch 'develop' into tcs_calculation