[#688] Merge develop into RC for testing

@zzgvh Can you check / merge?