Updated live branch

Merged ptr to live for 5.4.0 build 17345 and committed 5.4.1 build 17538