# gg-9546: Java part.
Merge branch 'sprint-30' into gg-9546
Minor fix.