Merge after fixing code review