Merge remote-tracking branch 'origin/model_upgrade' into model_upgrade

Conflicts:
	.gitignore