commonlib: edit util 222
wrapper/lib: edit 333
Merge commit 'f91bda770991aa53407ca7610b6cc22434e0c41d'
parent/lib: eidt 444