fix, change, clean up
Merge remote-tracking branch 'origin/dev' into dev