Ported fix for #929 from 0.10 to trunk. Testcase needs to be ported later since the behavior implementation is not useable in trunk atm.