Shell/3909

Fixes from QA