Merge "O-CU-UP: dependent library"