Fix merge from71x

fixes merge issues from latest updates in 71x