final commit before branching to semper-fidelis-kris