Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into...