Merge branch 'gateway-level-max-queue-values' into develop

This closes #70