Merge "verify embedded buffer matches address in parent" into sc-dev