Merge branch 'gj/push-more-verbose-advice' (early part)