Merge "Fix bug 2911311 and bug 2911700"