Update To R6, Fixes, Adjustments
Merge remote-tracking branch 'origin/development'