Setup for branch stable/1804