Closes: #11795 Signed-off-by: Thomas Way <thomas@6f.io> (cherry picked from commit ef60650f09)
ef60650f09