sync with DEV on 27-nov-2014