neurospinqc: sync with last jb's update.