Released latest changes of 6eb28e4f40f77e3e