Issue:Fss-33-37-45