Merge branch `test` into `master`.
Test 1D to 2d conversions.