Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf' * commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf': Add better debug output for ResourceType errors
Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf' * commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf': Add better debug output for ResourceType errors