Pilot release #3 staging - Do not merge until pilot release #3 is ready!