PE-1561 - Intermediate commit.