Merge "Fix new registration APIs as per API council guidelines"