tenbada direct commit - 2
Merge commit 'bee28554aded8a1010a1791ce9833170665295e9' into fix0006

Conflicts:
	tenbada_add_file_0001