merge with chil360 changes