WP: use directives to load controls
WP
Make examples work with new control load method
Merge branch 'feature/alternate-control-loader' into develop