Merge of Thang & Mainbranch