Merge @habikki proposed