New work branch based on master 42d7bdbea4ba8df285721ecf775e9997992e6964.