Merge "framework: fix bug for uninitialized variable"