(cherry picked from commit e45ffc530f482a46de25d28f18b039f296750414) Conflicts: models/fixture_test.go trivial context conflict and remove one line in deadcode
All files in subdirectories are templates, do modifications based on your environment first.