Merge "Annotations to help identify Framework vs Module related tests" into main