Merge branch 'topic/phy_attrs' into next