Merge "Fine tune the maganication area edit dialog" into rvc-dev