Merge "Move this constructor to comply with Java Code Conventions"