commit before ours merge stable -> master