Merge "Added attribution tag to note listener" into sc-dev