Issue #174: Updates awakeFromLocalInsert and awakeFromRemoteInsert mechanism