MICASERVER-43 Merge
MICASERVER-43 style