Merge "moving the request focus later in lifecyle" into klp-modular-dev