Isolated to new package.
Added new converter
Merge remote-tracking branch 'apache/master'