Merge "Use active/inactive fgs calls instead of delegate." into main