Fix for Gradle resource processing Switch attrs.
Merge branch 'develop'