HCP Alert settings and Display settings SQL and populate old data
Merge remote-tracking branch 'origin/master'