Merge "Backward compatibility for User management"