fixes merge issues from latest updates in 71x
Merge pull request #3007 from apfeiffer1/fixMergeFrom71x

BOOSTIO -- Fix merge from71x