Pr/1417

This is a follow-up on PR #1417.

Test now pass locally, master branch should be usable again with that.