Updated PR - User profiles extending limited #3242

This is a reference to #3242 with updated files. Thank you @chivitli!