Merge "Encoder code cleanup." into experimental