Merge remote-tracking branch 'github-aerys/dev' into dev
fix coding style