MICA 935 - FIX
(cherry-picked from 11afac6)
MICA 936 - FIX
(cherry-picked from 857a5ba)
MICA 942 - FIX
(cherry-picked from c349244)
MICA 941 - FIX Part1
(cherry-picked from 737325d)
MICA 941 - FIX Part2
(cherry-picked from 9e3b746)
Merge pull request #14 from Benbow/feature/mica-fixes

Mica-935, Mica-936, Mica-942 and Mica-941