[BZ 1069648] Few more updates from pull request review.