Merge #6 (diki)