Revert 6505886..475579d

This rolls back to commit 65058863dbf8b07f7a144b67da7de013e15d4abd.
Fixed bugs
Merge branch 'master' into feature/detailed-player
Revert ab0a9a8..a765839

This rolls back to commit ab0a9a8f468d4fb427eaa6495dad2f526713e001.