Merge "Remove -Wunused-const-variable warning" into integration