decomposed samples; improvements to explicit mode;binding of controls; path resolution in controls
Merge remote-tracking branch 'origin/development' into development