konsultant and KP v62
Merge remote-tracking branch 'origin/dev' into dev