(cherry picked from commit c17b2998a22d35baa6b847ae26c30414175647a0)
(cherry picked from commit ce60f5f25df4c8fe2b2b03d10610ee12a0c55405)
init package