AUI-1805 Moving rows and columns should be 2 separate features