Merge "Fix package integrity issue with non mano arifacts"