Fix and improve google placeholder header
t piMerge branch 'develop' into feature/29

* develop:
  Fix and improve google placeholder header