Fix for Jira Issue: MARLINTWO-110