Merge "Adding automated test for ag/14874758" into sc-dev