Merge "Allow possible removal of UMO with limitations" into main