Fork & Merge from various bugfixes on github