Issue 5267 fix push publishing error in master 2 5