Merge branch 'release/1.4' into develop
fixed other conflict
1.4 -> 1.5
resolved conflicts