please merge

see rm ticket 1018.