Merge branch 'dev' into mercury
Merge branch 'mercury' into HG-103-AdEngine