Merge branch 'develop' into JAL-3322_getdown_speed_improvement