Merge branch 'response-helpers-mix' into dev