UAT_Revamp Blocks_26.07