Merge branch 'release/1.1.2' into develop
Fix line number in layouts which resolve non line value.
Prepare release for 1.1.3
Merge branch 'release/1.1.3'