Incorporate changes from !37