Merge "Change default caps for BOUND_TOP to superset FGS" into main