- Also merged to xp5_8: #230