[#612] Merge release/candidate back into develop

@zzgvh Can you merge?