Merge "Add debug logging to sfps indicator code" into main