This PR was squashed before being merged into the 2.2.x-dev branch (closes #1599).

Discussion
----------

Fix CS

Commits
-------

c5ec5245 switched to short array notation
08d04b40 fixed CS