Merge "bug_3259956 and bug_2166704"