Merge branch 'fix_packaging_format' into custom