Cleaning...
Merge branch 'sapns__dialog_actions' into master2