Merge "Implement basic EAS 12.1 functionality"