Merge back last changes from oper-series