Merge branch 'lt/fix-sol-pack' into next