fix forward merge of ARAKOON-449-2