Additional 5.3.2 checks added after testing on 5.2 box.