Merge pull request #4669 from SajalDevX/fix/4660-rename-no-change-warning