Fix for issue MPEN-77
Fix for issue MPEN-112 MPEN-113 MPEN-114