Merge "Let confirmation dialog can appear" into rvc-dev