Merge "FRM event sync developement"