Merge "Encode_breakout code refactoring"