Artifacts of master #636