Merged gem and deploy changes from dev