sync with DEV on 10-dec-2014