Merge "resourcemanager: move common code into different source." into main