Fix for 46012
3 files changed