Confirmed with the server team that this wouldn't cause a problem for them if we changed behaviour here.
Confirmed with the server team that this wouldn't cause a problem for them if we changed behaviour here.