[NL20-NL50] FR25 - PF commited with AK