Demo display solutions
User can see solution when pressing the ? button
[Finishes #56185722]
Merge branch 'master' into gh-pages