Finished idp work

[#us1]
finished

[#us4]
Merge branch '2014.1-US1-AddIDPChanges'