JRE-612 [followup]
4 files changed