Merge tag 'v01.00.00.02' into develop