Master changes to Unix support branch

updating Unix support branch with master changes for testing