Merge "LSE improvement: better singleton array optimization"