Merge "[IT4.1] Clean up to remove no-op logic"