Merging latest changes from autotest:next