Merge latest changes from autotest