organization short name fix
Merge branch 'dev-master' into dev-dogovor
#700