[v6r11] Av140422 v6r11

Some fixes and scripts to deal with the following Issues:
#1302
#1597
#1257
#215