diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 560c92143b..199d630960 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Bnd_Box.hxx>
@@ -462,7 +461,7 @@ void ProfileBased::getUpToFace(TopoDS_Face& upToFace,
 
         std::vector<Part::cutFaces> cfaces = Part::findAllFacesCutBy(support, sketchshape, dir);
         if (cfaces.empty())
-            throw Base::ValueError("SketchBased: Up to face: No faces found in this direction");
+            throw Base::ValueError("SketchBased: No faces found in this direction");
 
         // Find nearest/furthest face
         std::vector<Part::cutFaces>::const_iterator it, it_near, it_far;
diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
index f71d86a690..2d733fda0e 100644
--- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QSignalBlocker>
 #endif
 
-#include <Base/UnitsApi.h>
 #include <App/Document.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Command.h>
 #include <Mod/PartDesign/App/FeatureExtrude.h>
 
@@ -36,6 +34,7 @@
 #include "TaskExtrudeParameters.h"
 #include "ReferenceSelection.h"
 
+
 using namespace PartDesignGui;
 using namespace Gui;
 
diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
index df39e51db7..1dd6318a34 100644
--- a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
@@ -20,17 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Precision.hxx>
 #endif
 
 #include <Mod/PartDesign/App/FeaturePad.h>
+
 #include "ui_TaskPadPocketParameters.h"
 #include "TaskPadParameters.h"
 
+
 using namespace PartDesignGui;
 using namespace Gui;
 
@@ -103,6 +103,8 @@ void TaskPadParameters::onModeChanged(int index)
         pcPad->Type.setValue("UpToFirst");
         break;
     case Modes::ToFace:
+        // Note: ui->checkBoxReversed is purposely enabled because the selected face
+        // could be a circular one around the sketch
         pcPad->Type.setValue("UpToFace");
         if (ui->lineFaceName->text().isEmpty()) {
             ui->buttonFace->setChecked(true);
diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
index 85a6b1d338..e42c84074c 100644
--- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
@@ -20,17 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Precision.hxx>
 #endif
 
 #include <Mod/PartDesign/App/FeaturePocket.h>
+
 #include "ui_TaskPadPocketParameters.h"
 #include "TaskPocketParameters.h"
 
+
 using namespace PartDesignGui;
 using namespace Gui;
 
@@ -108,8 +108,10 @@ void TaskPocketParameters::onModeChanged(int index)
             pcPocket->Type.setValue("UpToFirst");
             break;
         case Modes::ToFace:
-            // Because of the code at the beginning of Pocket::execute() which is used to detect
-            // broken legacy parts, we must set the length to zero here!
+            // Note: ui->checkBoxReversed is purposely enabled because the selected face
+            // could be a circular one around the sketch
+            // Also note: Because of the code at the beginning of Pocket::execute() which is used
+            // to detect broken legacy parts, we must set the length to zero here!
             oldLength = pcPocket->Length.getValue();
             pcPocket->Type.setValue("UpToFace");
             pcPocket->Length.setValue(0.0);