Merge Damien's changes to issue21_media

This merges @damienpicard changes to the issue21_media development branch.
This is done as there are lots of differences compared to the master. Hence, we first want to merge into its base iea-annex60:issue21_media