CR changes: renamed the method
merged dev