Merge "remove skip bug 1233026"