Merge remote-tracking branch 'origin/issue/240' into issue/240

Merge remote-tracking branch 'origin/issue/240' into issue/240 #662