PS-16-06-Light behavior

PS-16-06-Light behavior