Merging upstream version 0.8.0 (Closes: #639729, #761971).