merged selected patches from tcmgps changes
db pass for local