Last fixes for PF 4.0
Merge remote-tracking branch 'origin/master'