Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop'