Merge change Id10824da

* changes:
  Fix film init