Merge "Changes after Custom actor impl extension, cleanup, extension and test cases...