cw-675 All Guidelines Block
Merge remote-tracking branch 'origin/cw-675-list-guidelines' into develop
CW-675 Fixes for listing for all guidelines