Fixed Bug 423987 - [1.8][assist] Follow up tasks from Bug 422468