3.3 maintenance - Fix for 198483
2 files changed