Merge "Add behavioral parameters to MediaParser"