sync with DEV on 26-nov-2014