#1040 - Add license header
#1043 - Generated Resource Handlers should be sorted before being assigned
Merge remote-tracking branch 'origin/develop' into advanced-bundle