HotFix :Montiz Ticket 0005840

added current changes