Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop

Added some code of navigation issue