Merge branch 'add-lsb-template' into develop