Partial merge from https://github.com/helgp/WalCommander/commit/3a144ad6f05fcf18c040aacd52d7a4ccacb5ab20

https://github.com/helgp/WalCommander/commit/3a144ad6f05fcf18c040aacd52d7a4ccacb5ab20