EST-213, EST-148: split Party#agreements into two; Oscar's review