[#688] Merge master into develop

@zzgvh Couldn't be automatically merged, so created a new branch to test. Can you check/merge?