Merge pull request #6428 from dstftw/improve-generic-smil-support