4.0 string converterted to 4.1 where appropriate

Change-Id: I8dea10cb1559aefd0da199facb9905b68297a38d