remove cardinality for ticket 1699
Merge branch 'development' into LiamCardinality