* Promote S3993 to Sonar-way and convert to LayC format * Add missing newline to S2674 * Address comments