bug Fixes
Merge remote-tracking branch 'origin/Moore' into Combined