merge sprint8 to tao
add loons
-merge tao into sprint8