parent v20

- RIO-69
Merge pull request #43 from objectos/rio_69_scp_fix

RIO-69: parent v20