Merge in latest file extension mismatch work from develop