Merge "Password bouncer landscape fix" into sc-dev