Incorporate changes through internal release 4.1.4