Merge Hotfixes for 0.0.6