Patch 4.21 Commom Changes