Integrated changes from dev