Merge "Improved snar issues"