Merge branch '305_extra_character_on_renaming'