Merge branch 'develop' into dev-gt
[merge]
[Model/GT] Fix: trim the CR.