feature-MICASERVER-18 - code review