Click scripts fixes

Merged Amir MOHAMMADI requested to merge click-scripts-fixes into master

Improvements and bug fixes to click scripts

Merge request reports