PLA-1354 required params refactored