Merge "improvement for emma filter option" into gingerbread