am 47c0fcd0: Merge "initialization of defined variables"

* commit '47c0fcd0841764a50d05e1fa4831f3002258ae22':
  initialization of defined variables