Commit for tele-working. Maninly results of changes to satisfy
compliance checker.