Commit includes ControlLoopPolicy API and bugfixes