Revert "Revert "Merge""

Reverts amazon/test_root#5