Add singleton
azd
Merge remote-tracking branch 'RobotGit/master'