Merge "Let confirmation dialog can appear"