PFS-1411 #comment base ground work