Merge tag '20200524.02' into develop