WICKET-5777 Code review