Merge "resourcemanager: move utility functions" into main