Merge "Fix bug 2911529"