a branch (reverse-merged from commit ef397cbf7a434cd7ec7fd5294342b2ec4e81f7ba)