Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs