4.21 common changes