Updating with latest changes from autotest:next