Merge "Fixes application scenario examples"