Issue #2497139 by mpotter, das-peter: Alter hooks causing overrides due to object properties not sorted