Bug/lms 11361

@cpennington @doctoryes pls review