Merge "Add Moon in Functest"