Adding AMD compliance
Merge commit 'efdef23e9728f4340074a87669ea0d45a99b9d42'