[development] Usability core patches