[NO-JIRA] Updating with CMD option and bumping version

See my notes/questions inline...