PE-1648 - Intermediate commit.