OPEN - task 14: Matrix MTF 
Matrix upgrades, bug fix