Merge "Moving lockAndGetInfo to only load on version 29"