Merge branch 'pr-175-WICKET-6206'