White 13 06 acu111876 machine tag improvement

Implementation for `machine_tag` cookbook.