additional changes made to comply with GRATIAWEB-108 ticket; exclude-vo: Unknown.