Merge from asoper29