Merge remote-tracking branch 'remotes/upstream/OpenMAF-2-2' into OpenMAF-2-2