PH7 Amalgamation: Stable branch 2.1.4