Merge to dev #2