Master update before branching

Small update to merge to Master before branching from it. Update is needed for all future branches