Completed draft for LMS-2381