manually rebase to 1.4.0 develop
manually rebase to 1.4.0 develop part 2