Petar Tahchiev, Vlad Mihalcea, unfortunately only critical bugs and regressions are being backported to 5.1, so this issue will not be backported.