Fix review issues with factory commit
Fix issues with message rename commit
Fix issues with FrameDiff commit