Resolved conflicts from dev branch merge