Improvement for MODCLUSTER-349.