manual merge

Fixed bug that was affecting inserting and removing signals