Merged in code changes from shell