Fixes BPFD-89
Merge branch 'feature-response-check' into development