AERO-1263

Owned by akushiyama@dA