PFS-1432 #comment done