fix issues after merging IBPMiddleware with updates from the Master branch