Release...rc/kifli

Merging in changes from rc/kifli to the release branch of configureation