Fix for May - Total editors

Change-Id: I3dba1de1ce8bc94cdee6471fe223601b4996c3fa