COMP: Added 2D kernel.
Merge branch 'bug-18303-DeactivateTestsAgain'