Merge "Revive the old behavior of unsupported filed in public APIs"