2.4 Update

Updated files for 2.4.