security/swatch port to reflect this change PR: 53002 Submitted by: maintainer Approved by: edwin (mentor)