PFS-1135 #comment done