Latest fixes for Components, version 1.20.0

Latest fixes for Components, version 1.20.0