Bug fixes and cleanup compatibility with coder
Merge remote-tracking branch 'origin/master'