Merge "Adding/Replacing Plugins to format/validate code"