Merge jone-dev to master