Added OGP support as it is widely used recent days
auto-merge staging into master