IDEX-888 avoid showing several "Parsing file" messages
Merge remote-tracking branch 'origin/master'