HEAD - Fix for 50989
18 files changed