synchronize with tru_academy_dev