Merge "Restore kernel requirements for frozen matrices." into pi-dev