Fixed retain cycle
Syncing all commits