merge in glass-blanco-release history after reset to glass-kk-master