Merge "Fixes to prevent duplicate rows in ActiveUser cache"