UserA Merge fixes