Synchronizing master with the new branch (except

documentation).