revision 507
Merge r507