KP 70 and 103
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev'