I am tentatively marking this for 6.0 because we're doing a significant amount of rework to the parser/translators in that release and therefore we definitely need to make sure that whatever needs addressing is done so there. If that fix can then be easily backported to 5.2, we can look into that.