Fix replace of legacy package.
Merge tag '1.6.3'

Version 1.6.3