#80: Merge back 6.0