Merge "Test suite for flex-grid support" into stable/aluminium