Merge "Add demo code for testing" into main