Update [ci skip]
Merge branch 'devel', remote-tracking branch 'upstream/devel' into devel