Add cosmetic mount Closes #15305 (cherry picked from commit b14f04c485f6dde7be2257086eab863b5b78d6b3)
hotfixes