more missed changes due to branch merge fail