merging branch tomcruise