PFS-992 #comment done