bug 1242/1245/1272 done for validation 1.7.0(including demo dashboard)