master changes

Table of contents

Deprecation