Removed assembly during execution (avoid forking)
Merge remote-tracking branch 'upstream/master'