Merge from Tilen fork