B2g picl merge

DO NOT MERGE! This branch is to do review and generate discussion.