Fixes: #277 (cherry picked from commit 3ffcf114682f9b1730f54706ecbf1bf237206bb1)
Closes #1389 (cherry picked from commit 9d766cfed588ee49525f68815b7e5eb980ddc11f)