Merge "Dist merged jar instead of monolithic one"