Unified pull requests from twang817, ath0mas, DimaRU to nedwidek main tree