Merge "Bug 4957 Cleaning code and fixing issues from manual tests"