Bring master inline with develop

Brings master to basic stable level with develop. Nightly testing to be done on Master, develop to be done on pr's