Merge remote-tracking branch 'remotes/rth/tags/pull-or1k-20200116' into staging