Merge remote-tracking branch 'weiss/pr/3'