sync with DEV on 11-dec-2014