Merge pull request #5343 from astifter/fix_relocate_button