Merge branch 'stable-2.14' * stable-2.14: Implement configuration file usage Change-Id: Ia87ad9c9bb71dda1cf13f1daf86bb4aa386cdf25