Worked on stabilizing cross-environment builds for the RobotecAI/o3de-extras repository by addressing a critical integration issue involving the ROS2ContactSensorComponent. Applied expertise in C++, build systems, and ROS2 to implement a macro-guarded inclusion using the WITH_GAZEBO_MSGS preprocessor directive. This approach ensured that the component was only included when Gazebo messages were available, preventing build and runtime failures in non-Gazebo environments. The targeted fix improved continuous integration reliability and streamlined cross-environment workflows. The work focused on refactoring component inclusion logic, resulting in enhanced stability and maintainability for teams working across diverse development and deployment environments.