[ASA-201806-1] git: multiple issues