COMMON RCP - fix ArrayStoreException on close down
Merge remote-tracking branch 'origin/8.30' into 8.32