Preparation for 1.5.0 (ES, C2, L3G upgrades).