Mantis 177

Cambios selector
Merge branch '177'