PFS-891 #comment done