Clone containerContext before using it
merge master