APF-1454: Plugin configuration improvements and more versions updated to 3.5.0.