Merge tag 'v01.03.02' into develop