Merge tag '20200524.04' into develop