Merge branch 'typo/#6325-session-exception-typo'

Close #6325
Create failing test for merging allowEmpty
Fix merging of allowEmpty flag
Merge branch 'DASPRiD-bugfix/merging-inputs-with-allow-empty' into develop