Merge "nfc(api): Restore constructor to previous version" into main