patch for rebase master on release/1.7.0