draco: fix initialization sequence (again)
Merge branch 'draco' into draco_experimental