Comment 12 for bug 1806060

Uploaded to Bionic and Cosmic for SRU processing.