• issue 7756: phase 2 MSP improvements