merge of use-diet branch to trunk