Option 1) would be a welcome interim step whilst we wait for a solution to 2) (covered in lp:1287658).
Option 1) would be a welcome interim step whilst we wait for a solution to 2) (covered in lp:1287658).