sync with DEV on 25-nov-2014