SUMO-12582 Work in progress