[[ Bug 13026 ]] Port bugfix to 7.0 branch