Simplified to 2D
Merge branch 'master' into HPCA