Lme profile 1695 rebased

rebased version of #1695

removed duplicate commits with `git rebase --skip` (I only checked the first duplicate that it was redundant/identical)