Merge develop-0.4.x_edit branch to develop-0.4.x