Merge branch 'narvigation_drawer'
Block lerakas tovabbi fix