[#688] Merge RC into develop

@zzgvh We'll have to merge RC back into develop before the next release. Can you check / merge?