WICKET-5780 Code review