Merge "Fix fix for bug 2816327"