Merge part of 'jc/pack' into 'next'