Merge "Right align pwd field when space is tight" into rvc-dev