3.1. maintenance branch - Fix for 91426
2 files changed