Merge "Put education changes under new flag" into main