Fix typo
Fixed moment refactoring
Merge branch 'release'