Merge branch 'dev'
Merge branch 'dev'
Merge remote-tracking branch 'remotes/origin/dev'
fixed 3 tests
Merge branch 'master' into dev