Merge branch '759-crash-in-icbwe-for-hi-level-content' into 'main'

Change Q18 to Q16, solves the crash and the difference created otherwise is of...

See merge request !305