Merge changes from version 2.16
fix patchname
use python patch from old overlay/version.
Merge branch 'develop'