4.21 Common update