Merge branch 'release/2.1.4' into develop
Make sure future-queued resources make it into the middleware.
2.1.5
Merge branch 'release/2.1.5'