Merge in Thomas no-s3 branch