misc commits before merging branch S3