Merge commit '4b255a23041225103a6870e77a236f78c2816eda' * commit '4b255a23041225103a6870e77a236f78c2816eda': Improve the input policy handling a bit.
Merge commit '4b255a23041225103a6870e77a236f78c2816eda' * commit '4b255a23041225103a6870e77a236f78c2816eda': Improve the input policy handling a bit.