Merge master to resolve conflict in tests not present yet