1116 1117 update

Combined #1117 and #1116 branch.