Regenerate model

Change-Id: I6b9066c60b39efd6e8bae4c91769faf48b53555d
Enable release method

Change-Id: I8edbfc8b243ffe90835d59345c384dc215bcc6d8
Cleanup test

Change-Id: Ibd1e7f8c4cc5b95afefba4aa28b0bca114290f5e