Pull 14/11/2014

Pulling harmonization changes