Merge branch 'development' into ava
Merge branch 'development' into ava
Fixed broken display of checkbox facets
Merge branch 'ava' into development