Commit before 1st preview release (Added a debug switch)