Conflict fixes for development merge