Pla 1522 1523 both

marged 2 branches