Resolve ids from list at initialization
Merge remote branch 'upstream/master'