Merge branch 'master' into develop
Change sources to normal mode.