arranged matrix removed
Merge commit 'ce76b04954db8f863ae0726849af71efd8d361a9'