Merged in fixed lessonDD branching strategy