Reviewed with minor correction, please integrate (branch CR29597_1). Note that the last (forced) commit contains only correction for the new test case; apart of this test that needs a file to be added, build and tests passed indeed -- see Jenkins job CR29597-master-abv