merge in #649