(requires fixing issue 10386 & 10421)