Merge branch 'master' into kisskys_salsubaiee/storage_log_manager_fixes