put conditions
implemented in the GUI options for the manager
Merge remote-tracking branch 'origin/CristiN'