Merging updates from jahla master