start (reverse-merged from commit 8bb43925725edce2cde0b8c4a1bbeb10335f0ef8)