MAESTRO-3162 Take advantage of newer base
Note: Compatible with MaestroAgent > 2.0.2