#CEXT 367
Merge remote-tracking branch 'remotes/origin/v1.0-dev' into v1.0-dev-foooon
Merge remote-tracking branch 'remotes/origin/v1.0-dev' into v1.0-dev-foooon
#CEXT 373
map fixed
Merge remote-tracking branch 'remotes/origin/v1.0-dev-foooon' into v1.0-dev-Emil
fixes with map again ><
fix reg