Merge tag 'v01.03.03' into develop