Merge pull request #3617 from t-nelson/respect_woa