Merge "Fix for multiple audio/timed track feature implementation - part one"