Closes #1486 (closed)
So far it worked well for me. @christian.hansen can you test this branch as well?