Merge "Use Fuel 8 CLI compatible commands" into stable/brahmaputra