Merge "Fix variable initialization." into jb-dev