Merge branch 'bugfixes-and-gfx'
Merge branch 'master' into bugfixes-and-gfx
random alternate point