PFS-818 #comment forward compatibility