Back to development: 2.4.20
Merge commit '1d9dcda0' into bugfix-13853-selected-items-not-checked