Merge branch '4509_lzo'