Merge "MBB: disconnect upon validation failure" into sc-dev