PFS-894 #comment done