EXPERIMENTAL: Updated sources (with potential after-call-battery-drain fix