3.3 maintenance - Fix for 198483
3 files changed