Fixes: #U4-2343 for api controllers, already fixed for surface controllers