Merge "Use assert(Not)Empty,IsNotNone instead of assert(Not)Equal,GreaterEqual(0, len(.."