lergo-121-138 review comments
Merge branch 'lergo-121-138-review-comments' of https://github.com/lergo/lergo-ui.git into lergo-121-138-review-comments