synched with latest master override changes 57d34e65839cffe74b0baac916cd22f7194d48c7