Merge branch '4377_file_b'