Merge latest code to ndar_dev