added conversion pattern support
Merge branch 'master' into 1.2.11