automerge: cc08e61 * commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8': docs: platform updates for api 21