NXP-11403 - wrap UnsupportedOperationException into InvalidOperationException
Merge branch 'master' into 5.6.0
Revert "NXP-11403 - wrap UnsupportedOperationException into InvalidOperationException"

This reverts commit df6d16f88a15c15599c891d8213c923b68ff481b.