Fixed: IEMS-199
New Feature: Don
Merged new feature and bugfix for IEMS-199