[#INFRT-5: Add distr mngmt]