Merge "Add getters and private constructor" into jb-mr2-dev