Build: #168 failed Changes by Pedro Salas and Kumar Golap

Code commits

Casa6