Fix diff commits

I will remove gmo-1-3-rebased branch after merge this PR.