Merge branch 'lt/fix-sol-pack'