Merge branch 'develop' into task/JAL-3911_getdown_improvements