Merge "Adds macros for new encoder controls"