Merged from master

See the docs