Fix for MODCLUSTER-388.
back in dev.
Fix for MODCLUSTER-389.