Merge "EPUserUtils class fix"