Magn4349

@junmendoza please review it
http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4383