sync with DEV on 09-dec-2014