Various fixed requested by @ivan-basekit
Merge branch 'develop' of github.com:basekit-templates/bridge into develop