Kraken: Raptor: Separate clear and init
Merge pull request #375 from l-vincent-l/separate_clear_and_init

Kraken: Raptor: Separate clear and init