Updated per PM issue 348