ECMS-6518: Update BASIC_01,02