Merge feature/more-fixes into dev/donations