core branch: fix merge oops