Merge "[Script] Remove final modifier from private methods"