Merge "added eSOS test mode flag" into main