3.0 release branch gsb_feature_people_fpp.