Initial work to support Fog 1.23.0