I mislabeled commit a6b6b376f2fe97e41ab0d726b71ba96197cc1928, it is for this issue and not CONFLUENCE-165.