Merge branch 'develop'
Applied changes from arm-tap repo
Updated patch version