Re: AS7 work - what should be do before merging into master?