Merge "Test clearOnEventListener method" into sc-dev