Rebased branch to commit cc34dab of bar master.