Merging additions from sjawhar on 7-21