Merge to jone-dev branch

Request to update jone-dev branch from master