Advanced FBTest search/6454/issue6454 to also cover issue 7259