Fixed combo box crash due to intercell spacing not being set
Merge remote-tracking branch 'origin/patch-2'