Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into...