Bugs with inplace rename fixed
#SCL-5970 fixed
#SCL-6018 fixed