sync with DEV on 01-dec-2014