update for hwaf/mana-20130219