Merge "Init variables to fix compiler error"