Merge "remove uninitialized variable warning"