Feature/vicms 83