Merge "Improve test key names to reproduce public issue" into jb-dev