Merge "Bug fix for isEmpty() api"