bug 815093 - Merge