Master-side changes

Tests and documentation remain to be added.