Feature/no active idle

Feature branch to track #502