Update fixes from remote Squashed commit of the following:
commit 9d24d72bd3845fe6b84537a2d17774be93d59cd6
commit 9029ab640d834a796c8b6ffb8be0e83f3b6f2c7a
commit f54457a938da3cdddfdae0c0d5b295218c6f157b
commit 937a11cc86c3c3878431433944177a0045eeccbc
commit c53a91447ab7521c706788461293d4ab10c23084