synced with devel-candidate (reworked adaptivity)
synced with hermes korous-devel