implements #854 Co-authored-by: Qyriad <qyriad@qyriad.me> Change-Id: I958d082ccdf03179b35d5ab8a810ebafcff3b6c5