Case 4282 - Fixes after code review.
Case 4282 - Fix conflict.