PFS-838 #comment done