Bug fixes (see 2109 and 2118).
Merge branch 'master' of https://github.com/rptiwari/LaitsV3.git