Merge "Minor changes to validateAction()." into jb-mr1.1-dev