PFS-1119 #comment refactorings
Merge branch 'master' of https://forge.powerfolder.com/git/PF-CORE