Merge tag '20200524.03' into develop