last changes for hp apj deploy