Merge branch 'list-option-filters' into 'develop'

Fixed render_options filters that weren't firing in all cases.

See merge request !3838
Status Job ID Name Coverage
  Unit
passed #6095
phpunit

00:00:49

 
  Acceptance
passed #6096
juice
codeception

00:04:29