Commit latest code from Ning