Added on-demand plugins support. #534