development from TeamFun repo

Change-Id: Ib17791e054e4c53f76037e0ad6324c7c3e9a03ed