G in [I P] form
encoder in [I P] form
Merge branch 'master' into testing
Commented some lines in bp.py