Adapted to incorporate pull merge 54