Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap into next_version