Merged the latest commits