Updates from dev to keep collaboration branch current