Merge "Added support for supports-input manifest element" into klp-dev