Merge changes from topic "mar23b" into rvc-dev

* changes:
  Tests to verify MEDIA_TYPE values.
  Call parseOptionalYear