Beta 2.1 RC1 commit

Beta 2.1 RC1 commit for backup onto github