Adding previous merges from dev