Minor tweaks for ol6/SA406
Merge branch 'release/1.01'