DOSGI-127 Optimize distros and feature