Merge branch 'wrdp' into 'develop'

Merge branch 'fix/close_all' into 'wrdp'

See merge request o2oa/o2oa!3051