Merge branch 'feature/Ship_fit_detail_improvements' into develop.