Merge branch 'massivegittask-commit'