Merge branch 'enh/lcm_basis_conv' into 'master'

ENH: Update to peak removal in basis conversion.

See merge request !47
3 jobs for master in 17 minutes and 39 seconds (queued for 2 seconds)