HR-02 submit f13ff38c6b2eee180c851e40a81e4590,c2f5864869259e3197f72ede5ba6f3bd,47493775cfa533480f41e3651143f1fd,228d054b96d67c8f85e48dec91a94553,3096f3ce32c73f394519661d34ebc235 (#72470)

Barnabas submit 2011324de297b3d70b2e602ba316a29a,ff25c77af3f95ab7d20b51e43f8291e4,514e4ff9de4cadc7472b30589290a360,b7df0179d75602befb3430b49fe81a20,f04898161a401029045a9b8ea697ec52,a11086d3e12b59a4946d80ecb3009b4f,f491727d3d7cd06701462c0eb6cb5422 (#72081)

Squashing commit