PB-752 #comment Trying to fix problems with implementation of specifications
merged with dev
PB-752 #comment new logic branches added to handle location text.