Tagging 6.1.2 with various fixes.