merging latest changes from metova