Develop

Sync with latest code  from stories 167-168