Merge branch 'hotfix/2.1.3_version_bump'
bc-plugin-hook example file
Merge branch 'hotfix/2.1.4'
Conflift Resolve