arcean rebased merge request done by the author a few days ago on top of the latest h-d. still this needs testing and most probably won't make it in the next CSSU update.