Merge "Templates: Make sure resources are unique" into developers-dev