Merge branch 'feature/pingback-improved' into demo