PFZ-555: New commit