Merge branch 'master' into stable
Switch to stable branch

Signed-off-by: Eldon.McGuinness <Eldon.McGuinness@Outlook.com>