sync with DEV on 16-dec-2014