Closes #1698
Working on issue #1689
Closes issue #1689
Added test case for issue #1690
Closes issue #1690
Closes #1691
Closes #1415
Closes issue #1679
typo fix
Closes #1681
Added second testcase for issue #1690
Closes issue #1690
Merge branch 'rc3' into s3