Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'feature/navbarPanel' into develop