583: Merge 0a96e939236156ecdfb8eb53346eb62d99fe5ed9 into e9a2d7e7fa499d480f4706526eaef2e4f6169c13