Merged from Shiandow-master