Feature addition to be backported from Coolcats (Python version).
Feature addition to be backported from Coolcats (Python version).