Pull request id singletons/crowbar/crowbar/1682 merged upstream.