controller stub
Merge branch 'release/mergeinit'