Bilateral code change and some exception fix
Merge remote-tracking branch 'origin/dev' into dev
Fixed exceptions