Attempt to fix bedrock issue presented by user.
Merge branch 'origin/LuaDev'