Control: merge 690284 -1 It seems to me that #690284 and #690586 are the same problem, so I'm taking the liberty to merge these bugs. Cheers, Sven