CGIV-1536: 14.04 Fixes