Merge "Fixing the metrics_constants jump" into qt-dev