Merge review comments by asl79 and VanessaE