Kal Oct 16

refreshed from current release code