completed fix for HEMERA-3768
fixes HEMERA-3748
additional fix for HEMERA-3642