Merge "Refactor codes for manual scale ns"