Bug #1366210
Fixed Build error and fixed alignment for variables