DIQ-327 Triggering update causes script execution to halt
Merge remote branch 'upstream/master'