Any chance having this PR rebased on HEAD dev ?