Build setting changes that will resolve the errors on the dev box...

Hi @ogail, Could you please take a look at the build setting diff? Thanks.