DLPY-13: Add support for adding Location Attributes
Merge remote-tracking branch 'origin/master'