Don't return a metadata object unless there is explicit annotation or attribute configuration

Don't return a metadata object unless there is explicit annotation or attribute configuration #536