PFS-862 #comment finalizations. ready for liftoff213