Merge branch 'pinconf-rename' into devel