Merged weekly updates to hessuvi master