SLT-447 Merge fixes.