AOC_LONG: code
Merge branch 'OAC_SKOS_MERGE' into OAC_MERGE
AOC_LONG: changed video metadata
Merge branch 'OAC_LONG' into OAC_MERGE