Merge "add rename scenario exceptions"