#5237 Add changes from stand alone handler