Dev build atomic (24/47)

Dev build atomic