Merge branch 'develop' into risc-v