minor todo change
Merge branch 'dev' into gfate-intergration

Conflicts:
	todo