PFS-922 #comment moved to server