Utke1 edg3 cherrypick

Merged with the latest ROSE master