Latest Merge: bug fixes and addition of 2224 and 2225 socket callbasks in rinApp