Cherrypick changes from the properties branch

Cherrypick changes from the properties branch that is not properties or forms specific

![](http://www.sicfitscottsdale.com/wp-content/uploads/2013/09/cherrypicking.png)
`@see`