Merged changes from herman-rogers