Merge "Enable restart in getSpnFsm()." into jb-dev