Merge changes for everyhwrere support testing