update to 21.3 and update build files accordingly