Ny SnapperRy closes #17216 closes #6671 (cherry picked from commit a5bd790f0f526146846afc11a9935ca2bbcb8d4a)
hotfixes