Fixed issue with dealocating controller while waiting for finishing changes.
Merge remote-tracking branch 'origin/master'