3.5 maintenance - Fix for 287323
7 files changed