merge fix
APERTEWORKFLOW-941