Merge "Fixing the action provider demo"