Staged J.2.1
Revert "Staged J.2.1"

This reverts commit 1abee7d08ad35de94b3e6681c49eee308e46ba8c.
J.2.6
Merge pull request #1 from pboonlia/develop-base-J.2.6

Develop base j.2.6