Incorporated changes from v2.81.2.0 Beta