Migrate SIT changes to UAT

Migrate changes from develop branch to release branch.