Merged in missing changes from intra-waiton