commit for 6.2.1 on branch modeling-users