Moving new container code into master in preparation for 2.4.1rc2