Track changes made in the Middleware required for the RA

Revert to `dev-develop`.