sync with slava requests in 71X pull