Merge "Break long lines in Action classes"