Merge branch 'issue/SCT-1140' of https://github.com/Jayceh/Freeside