FLUID-5251: Conditional expander now working properly and according to comments in JIRA