Merged in rhaas/staggered
Discussion should take place in ticket
https://trac.einsteintoolkit.org/ticket/1756
Discussion should take place in ticket
https://trac.einsteintoolkit.org/ticket/1756