Fix for DBAAS-29.  Merge theme from EE-1.1.