Catching up development

We had 2 pull requests that merged to master bypassing development. This catches up development