Build: #326 failed Changes by Takahiro Tsutsumi and Kumar Golap

Code commits

casa6