Merge release 0.6.12.1 changes back into dev.