merged 31/10 changes