Merge remote-tracking branch 'origin/bugs/514604-hidden_ANTLR'