next part of changes
Merge remote-tracking branch 'origin/dev' into dev
some updates