Feature/mica1054

Fix Mica 1051 (in branch feature 1054)