Merge branch 'js/merge-edit-option' into next