Part 1 of 2 for merge of ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
2440 files changed