Version 1.3.7 finish
Merge remote-tracking branch 'origin/dev' into dev