Changes for QA Blockers Implemented