Merge branch 'convert_to_when_return'
Updated configuration