Multiple commits

Pull request with features/bugfixes being tested on testbed infrastructure.