Merge branch 'development'
Merge branch 'development'
#21994 Logo added
Merge branch 'i21994'
#22962 Fixed the bug.