Merge "add application id support to so"