Merge branch 'develop' into merge/JAL-3978+JAL-3553+develop+JAL-3989