Merge "remove extra semi colon" into jb-dev