Merge "Add more test-cases for <extension-sdk>" into sc-dev