Core-411: rc2
 - tested and working
 - TODO: refactor and add restAPI support