https://github.com/yahoo/CMAK/pull/924
#924