PB-651 #comment - new UI flow implemented for "home-ready"