Merge "Fix automatic package conversion"