dev checkin
merged with Devkin
integrated devkin
Merge branch '51931133-details-block'
merged with devkin