Merge "Moving getters and setters to the end of the file" into main