[Merge] From Unstable

Latest Patch Sept 8.
[Fixed] some screenplay issues

Change-Id: I9ee3ec0927af96359f0cb9f92017f80fed72bf5c