Merge action2020 features

Including image clearing